From 2d62a8811e093194cff271aea899e9e8c38c5041 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 23 Jul 2008 20:57:53 -0700 Subject: [PATCH] Fix a problem in WoMan that caused it to fail for some manpages. --- debian/changelog | 5 ++++- debian/patches/fix-woman2-th.diff | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-woman2-th.diff diff --git a/debian/changelog b/debian/changelog index c597f54a03c..9f7d04a6f21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,10 @@ emacs22 (22.2+2-3) unstable; urgency=medium "Bernhard Michler" for the report and Sven Joachim for the fix. (closes: #478240) - -- Rob Browning Wed, 23 Jul 2008 20:32:25 -0700 + * Fix a problem in WoMan which caused it to raise an error for a number + of manpages. Thanks to Sven Joachim . (closes: #476223) + + -- Rob Browning Wed, 23 Jul 2008 20:56:33 -0700 emacs22 (22.2+2-2) unstable; urgency=medium diff --git a/debian/patches/fix-woman2-th.diff b/debian/patches/fix-woman2-th.diff new file mode 100644 index 00000000000..c8e3f19a16b --- /dev/null +++ b/debian/patches/fix-woman2-th.diff @@ -0,0 +1,27 @@ +* WoMan should now handle various manpages without raising an error. + Patch: fix-woman2-th.diff + Provided-by: Sven Joachim + Date: Tue, 15 Apr 2008 09:42:31 +0200 + Added-by: Rob Browning + Status: incorporated upstream + + WoMan should now correctly handle a number of manpages which + previously caused it to raise an error. + +Index: sid/lisp/woman.el +=================================================================== +--- sid.orig/lisp/woman.el ++++ sid/lisp/woman.el +@@ -3810,10 +3810,9 @@ + (insert " -- ") + (woman-forward-arg 'unquote 'concat) + ;; Delete repeated arguments: +- (if (string-match (buffer-substring here (point)) ++ (if (string-equal (buffer-substring here (point)) + (buffer-substring start here)) +- (delete-region here (point))) +- )) ++ (delete-region here (point))))) + ;; Embolden heading (point is at end of heading): + (woman-set-face + (save-excursion (beginning-of-line) (point)) (point) 'woman-bold) diff --git a/debian/patches/series b/debian/patches/series index 5b7c5e77b6a..232839f5b51 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,5 @@ fix-vcdiff-tmp-file-handling-cve-2008-1694.diff make-fast-lock-cache-directories-risky-cve-2008-2142.diff fix-mule-select-safe-coding.diff look-for-news-to-find-etc.diff +fix-woman2-th.diff autofiles.diff -- 2.30.2